Snap for 12742097 from c50af9524f8556619f258d3f944ac415c70dac7b to 25Q1-release

Change-Id: I101e24d1068734b4b4252150231cf7ccda4b70ec