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

COASTGUARD_SKIP: I67149c6faa2766be6d2537f2315dd2734bdd0447
COASTGUARD_SKIP: I54ed2b18072eccd28ec199ad06e0cc8864f09a23
COASTGUARD_SKIP: I35df87ef05cb75dcd551cc4899a0a9863fdcbcc7
COASTGUARD_SKIP: Id2e796edee45dae281f867c2b1549a80984c8a8e
COASTGUARD_SKIP: I890d102d10a3efa230e26e4e9753f9c66b71afdb

Change-Id: Ia0230aa4a43bba117a2e954052013d78c4f44579