merge from open-source master

Change-Id: I77e33ce567b9682f51785cc574e37dc2cd15028f