Snap for 12370120 from 9b95956c09d4d59dca0a5626ef0b8879f475c2c0 to 25Q1-release

Change-Id: I33b093e63827e844ad23b21c6657b984f1dd9513