merge from open-source master

Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8