[coastguard skipped] Merge sparse cherrypicks from sparse-13270399-L91000030010642732 into 25Q1-release.

COASTGUARD_SKIP: Iae264aed02535b758f97a8fcf4fb8614d121793f
COASTGUARD_SKIP: Ib02fd0b3dfd354e53ff7e6d6d352d3e91933b3ea

Change-Id: If4a188c195168a1e26609df5fde03bdcf61d5aaf