[coastguard skipped] Merge sparse cherrypicks from sparse-12405038-L87300030006651231 into 24Q4-release.

COASTGUARD_SKIP: I4f5f4ccc3d22d8197d0da2c5231a74ebf3538f61
COASTGUARD_SKIP: Ieb4a1f35ba5a07cccdba789553d1248f21baa869
COASTGUARD_SKIP: I349ece5a7faa1e9d59c9137ce60a902596bc39f4

Change-Id: I70d88f1daa06426fef190e4f533f95f3293ea9c2