Snap for 12695596 from 0bc7872e4cf1ac8ae3f3d89eedf119aca9b59d0c to 25Q1-release

Change-Id: I7018faf8d9d10c495078b7e207811d53dd9e5773