merge from open-source master

Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5