merge from open-source master

Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b