[coastguard skipped] Merge sparse cherrypicks from sparse-11799897-L62100030003582657 into 24Q2-release.

COASTGUARD_SKIP: I9d0b0a6d3070dfd1398a3eccbf8677af22f5de2f
COASTGUARD_SKIP: I2a66651f935923623bea269aabea7476720573b1

Change-Id: I157a67cd0e7cef1b41460814d03644176aa037be