[coastguard skipped] Merge sparse cherrypicks from sparse-13814973-L68400030014407520 into 25Q3-release.

COASTGUARD_SKIP: I87ce51d9c4bf17b684eba34bc6018e7c247abb8e
COASTGUARD_SKIP: Ia57e0b834b230ad0094d0409e8934c1c6683baa2

Change-Id: I4a617094a6c05088b7e11bef353a1cbfe9ead97b