Snap for 12573674 from 40e5cc14cf99349aaea7123d752c9b32b31bb648 to 25Q1-release

Change-Id: I66c2d5ea6157b29cc9bcb3135852852924bbd485