[coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L90500000962658543 into udc-release.

COASTGUARD_SKIP: Ibd50eb67d1c943c69d7757b29579f01a59cd09fa
COASTGUARD_SKIP: I35df87ef05cb75dcd551cc4899a0a9863fdcbcc7
COASTGUARD_SKIP: Id2e796edee45dae281f867c2b1549a80984c8a8e
COASTGUARD_SKIP: I890d102d10a3efa230e26e4e9753f9c66b71afdb
COASTGUARD_SKIP: I67149c6faa2766be6d2537f2315dd2734bdd0447

Change-Id: I36f5ca4adedee5d3f014a4ed385b9c5ac9364680