Snap for 12623742 from 33045bdbbefa7e076cf249aa405189bb7b5f8c60 to 25Q1-release

Change-Id: I1bacfbfa1b1616b64b4284d2088eeac1e162914a