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

COASTGUARD_SKIP: I99fdaa2dd2a163c46ea9003394a626789ea6fbb4
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: Ie61b3e2cd90ce0fa306e3b2fec4b66ef5a11c1f4