Merge branch 'master' into wyh

Change-Id: Ica501a2ec76395d56157f93aa9c36f7ab302d8fb