Merge branch 'wyh'

Change-Id: If76ca542acb05c805fc6f3d64fb7e8e62d5677e0