Snap for 12770256 from b172e8647283db7fc1f4e15128ff20ada13dd442 to 25Q1-release

Change-Id: Ic534ad217c8ee116f0a26ffdda444319df798609