[coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L18400000962566963 into udc-release.

COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: I0425d8869040ec5ff020c95a21f396bf60000e6d

Change-Id: I6ead99d1af434b63a905278905fa2940fb7e3fcc