Merge branch 'wyh'

Change-Id: I55d5826b58de971650ef431403ab7830743fac28