merge from open-source master

Change-Id: Iee26d951b665e3cec3487dee026f6b529ea2c64d