merge from open-source master

Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01