Snap for 12399304 from e2290782cf66b3dae853995d85885d07dbee4ca6 to 25Q1-release

Change-Id: I553c2c746109f5220b0383b5a1cd6a038c2c75d2