merge from open-source master

Change-Id: Ib9250bd9d73664b07facaef362beba57a1519411