Snap for 12680993 from 4e74725416b61cb4464e9d9206068ba0ea8e85e0 to 25Q1-release

Change-Id: I85d93ee474bead7639f75f76d55dcea3b1c2b131