merge from open-source master

Change-Id: I2be62bce462ee53fe9519f433523bd7a44a73d40