[coastguard skipped] Merge sparse cherrypicks from sparse-11973172-L89500030004648534 into 24Q2-release.

COASTGUARD_SKIP: I2e6f859b0838a2a21922e09f59404992f1ddf4ff
COASTGUARD_SKIP: I47b8b72a5a5c4098b46f0b5dbbf0654513b03aee
COASTGUARD_SKIP: If4ab3030cfa1f9faed5d099077e5e3bab2cba622

Change-Id: Ie040fe88abec9313791ab597e83c4817a3135c6b