[coastguard skipped] Merge sparse cherrypicks from sparse-10873617-L67100000963226378 into udc-release.

COASTGUARD_SKIP: I3466d207247e9a8fc26c785e197b16668d33390c
COASTGUARD_SKIP: Id8aaba76fed5e55a14073d48069b893820a55d2d

Change-Id: I120cd7277f5f02dc841672df8d44b810b47385d7