merge from open-source master

Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79