[coastguard skipped] Merge sparse cherrypicks from sparse-11963768-L37300030004576966 into 24Q2-release.

COASTGUARD_SKIP: Ibfa47f6e519bb1da2c663f85e22ee043704c72a1
COASTGUARD_SKIP: I384699d478e5abcee3a165afc45211b9ed96334a

Change-Id: I6df10a3a5d121da454ceebee946c8705ab6d6fa1