merge from open-source master

Change-Id: I323b3e716af939a3307189e694f4cdb83b4eda80