merge from open-source master

Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2