[coastguard skipped] Merge sparse cherrypicks from sparse-13018634-L05100030009413150 into 25Q2-release.

COASTGUARD_SKIP: I14c16acf12b86fc6fa7040c5397a4e55790f0ab7
COASTGUARD_SKIP: Id1da2bce7689a41e1154272e8032526d171183f5

Change-Id: I66008c7a3e13f53081135ba9a702b3c38e3f0b1e