merge from open-source master

Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd