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

COASTGUARD_SKIP: Id0aa5e8bd7597d2cb3f460f5bfec112890225e8f
COASTGUARD_SKIP: I237e43527c64121f830753e113c26dbab51ff47a

Change-Id: Ida45b9ba674b3a445721002835c3cf84e9958311