Snap for 13129673 from 3b2eb8c1bd40bf3755f79fd40b19e6b87daa435e to 25Q2-release

Change-Id: I9d4097be6fff3c3f7c902ad23d2e87f4c94f4598