merge from open-source master

Change-Id: I05f81438ef2226c000a8b7cf7ae5b6a908c51f9f