Snap for 12543847 from 9f26972764976711e2c8743d0820839e10a50df6 to 25Q1-release

Change-Id: Iea8fe9ddced165a190247282a08676e174e5413c