Snap for 12695596 from 7bae82844252e58a320666900759956f32fd6e3b to 25Q1-release

Change-Id: I0f8afcc7d43ef5db0259fb32672cdf9ab1ef6aa0