merge from open-source master

Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46