merge from open-source master

Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623