Snap for 12695596 from 6f98c56b75b9fa65c737f5dadc4705a6fa8f48d3 to 25Q1-release

Change-Id: Ib2129fec73974917a72181e0a1919ed2795d2fcb