Snap for 12551711 from 45328a6d6282fecd2c2b06602695a8b93ddb5261 to 25Q1-release

Change-Id: I6bbe9e49cf6d2f39b77ab6e0fc548b6e825fc3d7