[coastguard skipped] Merge sparse cherrypicks from sparse-10739010-L93800000962847818 into udc-release.

COASTGUARD_SKIP: I073e25b8e4db19f9680e4ef7cda6baa7c265b925
COASTGUARD_SKIP: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0
COASTGUARD_SKIP: I384350abb6feb12beee8b7788b3d577593eec763

Change-Id: I487f0ab3848c1fb65ff2135da258a3f4953a91f1