merge from open-source master

Change-Id: Ibc43e8da821400022726b119940708efb052908b