merge from open-source master

Change-Id: Id96727850237dd454ca30090a27b67ba4f75f881