merge from open-source master

Change-Id: Iaaf00603ec92506775c28cc6a4cc587d3a02939a