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

COASTGUARD_SKIP: I856c812d22363cc1d1e8aa88706d4d3b89044f52
COASTGUARD_SKIP: I9a978e1c1a1eb2b50382905083ebf22ac41e1918

Change-Id: Ib208bef4fc28474506cd087fcda56d604f2d01e5