Merge branch 'master' into wyh

Change-Id: Idb7fc904684880be0ac9b935b9df578c1f522146