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

COASTGUARD_SKIP: Ib7f944dc167ac1bb571eabeaf2dab6ca4ee4e817

Change-Id: I156cc007e38e22e3beb97134f98d3a4b50d155fc