Snap for 12337407 from be2ad9d2cd96566ce22bfcd405fe21055b2f083d to 25Q1-release

Change-Id: Ide846a65e291f417767d0a64029f09ae935ff386