merge from open-source master

Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445