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

COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: Ifc8c16ec3926b14d558692d830adbc78e5438d3d

Change-Id: Ic7c41a968828c0fbadfbfb3fe1546afcd24d38fd