Snap for 12616459 from 0aecce38a8dc21af61c84d5692d3f0d0208ee598 to 25Q1-release

Change-Id: Ic73a7fca30db6fb3ecace175fc46a04cfef1218f