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

COASTGUARD_SKIP: If4ab3030cfa1f9faed5d099077e5e3bab2cba622
COASTGUARD_SKIP: I47b8b72a5a5c4098b46f0b5dbbf0654513b03aee
COASTGUARD_SKIP: Iaea9f3b59405e47a96dc48cc4df136185a64af6a

Change-Id: Ie1383e660a242403b5511468f940444df92934fe