Snap for 12337407 from 74f932caf80522c99cd67cc5c3f0944ba6a33fe1 to 25Q1-release

Change-Id: I51028e434db7ab7db90314681899b39660ca41fd