merge from open-source master

Change-Id: I050a2b6f3d09f079a50491aeabb86b242a59d647