merge from open-source master

Change-Id: I90bd618ff8c6bcbe1071468e0d75574feee58d27