Snap for 12748980 from fe2bcfd55cc12ab9b1d8118e1faf29eed9070068 to 25Q1-release

Change-Id: I66115fe8d221a075d0794ea6a222b004e4cc83a2