merge from open-source master

Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823