Snap for 12337407 from d185a0cb4c4b385c71387a97218d35b9f3ca21e3 to 25Q1-release

Change-Id: I0995398b18fa0dd7287993970df469346d1cad1c