Snap for 12722466 from 788fee2154f46b39fb67d89fc52dfa74566626c4 to 25Q1-release

Change-Id: Ie6b6522d7486998a71206e79bc5d25d4be6e20cf