[coastguard skipped] Merge sparse cherrypicks from sparse-13083703-L97000030009736637 into 25Q1-release.

COASTGUARD_SKIP: If5b71f8514414fb5ef697fe28ed9cca1d6c230cb

Change-Id: Icd1213f8bf6cd7f56b44260a3bd7810f6f721e25