Snap for 12702769 from 7bb99c8cc4214edfbb37437f2a580b9b32ca01b3 to 25Q1-release

Change-Id: Ica39e07cdac7a631a693665db2744fd5222dd043