[coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.

COASTGUARD_SKIP: I68b893cae48139fc6188b4eb8a306849b0f6a8ec
COASTGUARD_SKIP: I123fc9afcd125fbfdc38f6a899d2016b141083b8
COASTGUARD_SKIP: I83852b7c11925d054ef38442f3cbd564c59866a2

Change-Id: I0eb1016cd5d46ce88182e80ba6a34e7ea4a445b0