merge from open-source master

Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85