merge from open-source master

Change-Id: I6262a725068f89c989e2e6706bcd220ddb217c8e