merge from open-source master

Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51