[coastguard skipped] Merge sparse cherrypicks from sparse-13272751-L40800030010704228 into 25Q1-release.

COASTGUARD_SKIP: I2f29dba2761a54b53ef249b4cbc968b7a2fa1db2

Change-Id: Idba6a89f92ccf9fdc8c38da7f4be3f4e010dfd36