Snap for 12695596 from 204fce61f8ece3147865c3c1b19ca3ffed075c52 to 25Q1-release

Change-Id: I02702a5510935b00f64cf8e0d52f387d2cbad029