[coastguard skipped] Merge sparse cherrypicks from sparse-13104707-L08100030009932905 into 25Q1-release.

COASTGUARD_SKIP: If8da0bb7e22f8b76fd6d7216eee1cdc535a49043

Change-Id: Ibc44816e85187cb4e642a05fc03bc1e608f142ba