[coastguard skipped] Merge sparse cherrypicks from sparse-13425744-L97400030011689433 into 25Q2-release.

COASTGUARD_SKIP: Iead9c06835a227ae870ba71d70a9e9461ef64be9
COASTGUARD_SKIP: I49b425dc1c7d50cd7ef1e0dbea4b880633dd021c

Change-Id: Iee447d138c0ad0206133f722b8cfe0c8efe27f1c