[coastguard skipped] Merge sparse cherrypicks from sparse-13218059-L75500030010391139 into 25Q1-release.

COASTGUARD_SKIP: I87e961db0897d48c869c468a39feb88717b105b8

Change-Id: Ied28868c6a4e23ac1edebd5ada02ababb8995f46