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

COASTGUARD_SKIP: I701b59642efa871f8902794ccc6ac865b1a829ea
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I939968a84909761642b77cc8c747f2010821b6ae