merge from open-source master

Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90