merge from open-source master

Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa