merge from open-source master

Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4