Snap for 12337407 from 3d226c1ff8c328409fa0d8a36f86ffea43f2ed4e to 25Q1-release

Change-Id: I4fa606ed6003d78b1d732c676ab0996264c3f4ff