Snap for 13256841 from b41967607dd7f1a24a71d393dd2055ac8dc54b91 to 25Q2-release

Change-Id: I9eca7640e05f5aeaa0578a0d8b77a0992ad7e7fa