merge from open-source master

Change-Id: I44bd527e51d102a56a1efe40cb6e634859b09461