[coastguard skipped] Merge sparse cherrypicks from sparse-13130632-L97600030010353085 into 25Q1-release.

COASTGUARD_SKIP: Ib30b108a0424cb4bf2159790ff12de35a9815dea

Change-Id: Id686bfa3feabd8e6d4904a27db7c7497ed95a26a