Snap for 12695596 from 82e515bcaac323a3f745567b65f25816ec931e9a to 25Q1-release

Change-Id: I667e19cf4992fa2449633b60ef36aa7950316d99