merge from open-source master

Change-Id: I8e7903bcd3fe7ddf88b63462dc9123f12b779c64