merge from open-source master

Change-Id: Ia08d4f55f5cdced2878777e0812c8cbbf26bb0d6