merge from open-source master

Change-Id: I8cfc9c0b699eceef77a905ca2f8cbdb1ab06bf1d