[coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L61400000962657635 into udc-release.

COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: I510705eb4917a56edb74e8f2754c7229338a9f1d

Change-Id: Id0b570c11d1abd4ca934fc1989c8d66c62a5cd0b