merge from open-source master

Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010