Merge branch 'master' into wyh

Change-Id: Idba8e92cb1c0516bac3878ec219cd1ee59e6e664