merge from open-source master

Change-Id: I408b5705b18d9e93e66bfbfeec0e3baefd618dec