merge from open-source master

Change-Id: Ibc1c58aa757910f2b00acf6883127dd027f01d73