[coastguard skipped] Merge sparse cherrypicks from sparse-10615697-L60900000962405601 into udc-release.

COASTGUARD_SKIP: I8eadeecea932cad65ff512b1dd944f1e2f0dcde4
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: I5ee9152089d621518d605a1380b39d3bee6cc2ab