Merge branch 'wyh'

Change-Id: Id732e1f6541cd7c075e60e6475b73a9515325f4b