merge from open-source master

Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16