merge from open-source master

Change-Id: I93512089253f00b3da1e31f8b5f4d6e72fae8dc4