Merge branch 'wyh'

Change-Id: I9b3ccf2404566516f12dea946873bc3b0d2b92e9