[coastguard skipped] Merge sparse cherrypicks from sparse-13585864-L01400030012734454 into 25Q3-release.
COASTGUARD_SKIP: I47677eda5bb21155fc3d59401192ad5442404021 COASTGUARD_SKIP: Iac3be94342e7def142e31bac34ab9043e870c305 Change-Id: I1514e85ea1e9dc4ff703481c428cda7976b2036c
This commit is contained in:
commit
3a0e86938d