[coastguard skipped] Merge sparse cherrypicks from sparse-11572409-L71400030002488458 into 24D1-release. COASTGUARD_SKIP: Ib837ff2ede2cbd9cf359984f5787bf4234fc55c8 COASTGUARD_SKIP: I271d07d580885324c2dcb02719e2b3cd58a457bb Change-Id: If4e748f4f01847a5285031c35a62391a00db734c