merge from open-source master

Change-Id: I2f725ca20bf08748a4b3e81a4e98fbe08fcf1a47