merge from open-source master

Change-Id: I0221f3903a2fc6a0fb25ae62913fdc2e9d3c3f4f