Snap for 12337407 from 867cea69d24e46c6730fdc1d4737f7b552dfec2c to 25Q1-release

Change-Id: I76184aff05acf3704f4a283f4b104b094570529f