merge from open-source master

Change-Id: Ib18c1121d51bd176e0de1666cad19ef10261825a