[coastguard skipped] Merge sparse cherrypicks from sparse-12117444-L33400030005820780 into 24Q2-release.

COASTGUARD_SKIP: I8234d2dc05767fc137343e622a6bbcb6cb6474e8
COASTGUARD_SKIP: Ib76fb34d8c9fa0317c7cc150a80d5fe79bcec81f

Change-Id: Ic0a59eb6ca88d90ff514c4a4d0b389e023f30f90