merge from open-source master

Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0