Merge branch 'wyh'

Change-Id: I4de4fc2f1df0af74896c507b470e98472379de6f