[coastguard skipped] Merge sparse cherrypicks from sparse-13218059-L43800030010400522 into 25Q1-release.

COASTGUARD_SKIP: Id29ca197e27a5e82d880ac87737132a07f012982
COASTGUARD_SKIP: Ib02fd0b3dfd354e53ff7e6d6d352d3e91933b3ea

Change-Id: I23ce1adeaf35dd4a68df4bd45a7296aabf5180d5