[coastguard skipped] Merge sparse cherrypicks from sparse-10609355-L16700000962392049 into udc-release.

COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: I787658a004873e5650cf885483528f867a00b7ab

Change-Id: Ia56018de842e6167a86d56ba0dbd5fedaf24d6a7