merge from open-source master

Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650