merge from open-source master

Change-Id: Ia4356e797e0c9bceec56a9a5cfeab3def5ae453c