[coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.

COASTGUARD_SKIP: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
COASTGUARD_SKIP: I9d015affca1495ebe671586f21ad6b408eb170b1

Change-Id: I37921f0747d7ab1f207627f1ce92f80bdde54403