merge from open-source master

Change-Id: Ia641d105e05982e3a3c85c7b82a70fe1fa664f1a