[coastguard skipped] Merge sparse cherrypicks from sparse-10615966-L19700000962413635 into udc-release.

COASTGUARD_SKIP: I184c20dd6fd388f8abc430e14825f2489f41c1b9
COASTGUARD_SKIP: I237e43527c64121f830753e113c26dbab51ff47a

Change-Id: I0ca21b2bf9b562bef74ee2e7351ea1cc419e5c8c