Snap for 12537680 from a8bb910459cf63068d9df88e2515ed4fc763fe2d to 25Q1-release

Change-Id: Idf35ab0ac2c91133d865d10f2946b606f6ccac1f