merge from open-source master

Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3