Snap for 12695596 from c05a422cd8004e587f1937df534662d2779bffb5 to 25Q1-release

Change-Id: I6513fa8fc96caebff23be4421258fe34ac973cbb