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

COASTGUARD_SKIP: I47b8b72a5a5c4098b46f0b5dbbf0654513b03aee
COASTGUARD_SKIP: Ia5c1e8d120358a2e89f900296d39f1c76cb1954f
COASTGUARD_SKIP: If4ab3030cfa1f9faed5d099077e5e3bab2cba622

Change-Id: I3366a5d47f4e7f404135e1b29256bdf14e2885c7