[coastguard skipped] Merge sparse cherrypicks from sparse-13823283-L14800030014345027 into 25Q3-release.

COASTGUARD_SKIP: Ifdae79e0ccef1d532a0801a01e8f2e39e382a394
COASTGUARD_SKIP: Ib1c095f7eedb512d2bc4ba16b4a52fdf8fac40e4

Change-Id: Ie933ac443fba1dfa8b10a139685bd63eeeba0ebe