Snap for 13256841 from 62e70ca21604563c734963806000c1442111e1a5 to 25Q2-release

Change-Id: Ifd919e0bafa56b1bf197653019044152c1c8b41c