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

COASTGUARD_SKIP: I35df87ef05cb75dcd551cc4899a0a9863fdcbcc7
COASTGUARD_SKIP: I508d0945cfe71393d9bcf7923d9a13678e6b75fa
COASTGUARD_SKIP: I67149c6faa2766be6d2537f2315dd2734bdd0447
COASTGUARD_SKIP: Id2e796edee45dae281f867c2b1549a80984c8a8e
COASTGUARD_SKIP: I890d102d10a3efa230e26e4e9753f9c66b71afdb

Change-Id: I15c5aa57241ed44e3878bbf040226aa3d0c13495