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

COASTGUARD_SKIP: Ia61e74593908644e3baf5ded44d2056d9ea8f9b4

Change-Id: I22a5ad616a1fc3478b1cbab396a4c5352981defa