Merge branch 'master' into wyh

Change-Id: Ie76c6f80d9f49d1882e3468ae31cb54417182abb