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

COASTGUARD_SKIP: I55c23afc0c338c6c009b99822780f1998d4a624b
COASTGUARD_SKIP: I634fff3d6b6f4392dffab3a0ee8082f0a6eefe3e

Change-Id: I9437f05b0389ab6f17c8c74b156e7fcac2e7add9