[coastguard skipped] Merge sparse cherrypicks from sparse-13096125-L88400030010046384 into 25Q1-release.

COASTGUARD_SKIP: I0c43890ee1f64d1867b9cbcd227b898116bdb7f0

Change-Id: Ic8f078a68263d0cd21e5cd20d802ba87a3133918