[coastguard skipped] Merge sparse cherrypicks from sparse-12408240-L23900030006656331 into 24Q4-release.

COASTGUARD_SKIP: Ic1eb051da2576b2fb51c3482eccbe60f27fcb819
COASTGUARD_SKIP: Ic58e7eee51e0f3a15d62ca6e5db85f1b291bd865

Change-Id: I3b3221aed508faebe7e5df714dadc2567b757c3a