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

COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: Ia7407f60bc7a1dd82f6af03f5c9f44e2f2f41108

Change-Id: I08eccc28fdf4aaa3cb2dd4203909d294bc049451