[coastguard skipped] Merge sparse cherrypicks from sparse-13240079-L72900030010449535 into 25Q1-release.

COASTGUARD_SKIP: I38719828e40435293b2576fbbbfebfed6cf8cef8

Change-Id: I84db777edc30d05b3a801a38fb4666cad3cec9c5