[coastguard skipped] Merge sparse cherrypicks from sparse-10615833-L02900000962494793 into udc-release.

COASTGUARD_SKIP: Ibd4d143838b7cafcfd85a40541295c3332b7be08
COASTGUARD_SKIP: Ib4e0c5d297311677bdedd0f05fb35d848359abc7

Change-Id: Ib309f0d869c53a73d5d4632c6f3de72259ef8a96