[coastguard skipped] Merge sparse cherrypicks from sparse-13150826-L06100030010209915 into 25Q1-release.

COASTGUARD_SKIP: I1f6427b14b3492f350faacb3944e092d5780e5d2
COASTGUARD_SKIP: Ib02fd0b3dfd354e53ff7e6d6d352d3e91933b3ea

Change-Id: Icd0d1daf796c2e430e7e02933b9c6df9060f7828