[coastguard skipped] Merge sparse cherrypicks from sparse-10616066-L90100000962413158 into udc-release.

COASTGUARD_SKIP: I09e8877ac2325a0056c931ce01602fffb7e68c35
COASTGUARD_SKIP: Id94cf42880f2d65d98fb9c06b3eb6ac1a0921ceb

Change-Id: I1c42c57a382e2d2596f1c18b1bdad3c6a357de14