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

COASTGUARD_SKIP: Id976dd82d405db4f4515d089a69614030812059e
COASTGUARD_SKIP: I33aa4b1b2b00f4345b02a1c0e8ab8c77de6a0437

Change-Id: Ifff85468b515813a65591ad8d14a67a347dde51f