merge from open-source master

Change-Id: Ic084784dc5ca0f98367b2824261be0be4f9617bf