[coastguard skipped] Merge sparse cherrypicks from sparse-10843127-L40700000963720032 into udc-d1-release.

COASTGUARD_SKIP: I88e45c1a84e01c7ea4eb2dcb7a3689310170e908
COASTGUARD_SKIP: I856c812d22363cc1d1e8aa88706d4d3b89044f52

Change-Id: Ib906b2107574063bb2e4892867ea118eeac14aeb