merge from open-source master

Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb