merge from open-source master

Change-Id: I03f6a73a782706a7c77041db4e626c40dffa647a