Snap for 12742097 from e4b8abac22b96410a8e755ae4f9ef999789b4d5c to 25Q1-release

Change-Id: I0acd39b74869d191ca8c0a36ce5c2fa0bdc34576