merge from open-source master

Change-Id: Iad583004b67ce1ef0651e81b57c2c95632da9845