merge from open-source master

Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525