[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L75300000962528215 into udc-release.

COASTGUARD_SKIP: If54a4f4d8ed5e882b38ab475b68f6e312c9423f1
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: I008d32f49cac005501b6c0e2e512d03a952156ac