merge from open-source master

Change-Id: I698b3c16bdef8751cc857b00f815cb2f95465431