Snap for 12715656 from 0155f0faf1ea088acaeefa83589d64794d2d9f49 to 25Q1-release

Change-Id: I88d1531f7f4aa0a5dcdb151498d2e0b193b64152