[coastguard skipped] Merge sparse cherrypicks from sparse-11282838-L21100030001153269 into udc-d2-release. COASTGUARD_SKIP: Ic38d8e5af790ccf99c455018df5b4f8d12207140 COASTGUARD_SKIP: I7c0ecbb7e60cb6ddb19276ed05b26759988cb98b COASTGUARD_SKIP: Ia1a7f6bbedf2765950eab697a4b8a5501ef1ec29 Change-Id: If1b9c59f1896abddb54edc31eb8ec196ce7adace