[coastguard skipped] Merge sparse cherrypicks from sparse-10683547-L40900000963064768 into udc-d1-release.

COASTGUARD_SKIP: Ie6db9d6241417e4d03bf11f579fc548f9ddc3e17
COASTGUARD_SKIP: I48ef806f9f3ad4f5edb96b8f83a5bd23e04c22c6

Change-Id: Ie38a476e56497ae16ca4dba4bfceb7fb8d7211f3