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

COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: I858cb023d2e533c56209e724e603d8a310931074

Change-Id: I5e41aebfd66b525d4ee67daa5e8c4ab4cc6886ac