Snap for 12632753 from 5b3cfafcf28f6d669bb7880eec8511d5724cd297 to 25Q2-release

Change-Id: I2d57281d2aff37f5c7d8165b2b3cd16010850fbc