merge from open-source master

Change-Id: Ib00a02e90d5c2c0b4cc1919258b858930967198b