merge from open-source master

Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38