merge from open-source master

Change-Id: Icb039ab90287961b1ad358b78eaead4a9aa2ae59