Snap for 12524026 from 294468355711b6b495947922ff03d47d8bb87e32 to 25Q1-release

Change-Id: I76d2c92a0371b89c9ffa94dcc8ff554ae5093729