[coastguard skipped] Merge sparse cherrypicks from sparse-11860263-L41200030004374858 into 24Q2-release.

COASTGUARD_SKIP: I3c0e4621a26f9e6d7bca7ac0db02c17f908f8b20

Change-Id: I0ce665bd5e90a861c6191b93a8c326a3470ae2e9