Snap for 12748980 from 2311e53f4d401cfbbb709555005b8defcc003a35 to 25Q1-release

Change-Id: I607f2ffa1367a8d413ef4ea7cbba3cec15c82938