merge from open-source master

Change-Id: I2dacf7f8895debd0452c3601424e32a3b9e19059