merge from open-source master

Change-Id: I3b89fb8a09f7c3e1a23695572bca33751626542d