merge from open-source master

Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921