Snap for 12770256 from a4ddeedfc3ee68262b77a7fddfb1cc8530329964 to 25Q1-release

Change-Id: If89eb6e196ac04dfe342b27ff0ecb6ef04c6ed8c