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

COASTGUARD_SKIP: Ib7e80d58d5c18a95ba139b675aaa958a19d26fff

Change-Id: Id00b7e71d3eb4284de8c549ae51a53c9ff674bc2