Snap for 12664851 from 986003708c0bd0fa568fb401a2eba00a5aba1043 to 25Q1-release

Change-Id: I4a3826efeb64c6de0f6641698286893bcf0016c3