Snap for 12651823 from cd03b89b30bfecaf34f710a6c8d663c6e24116e9 to 25Q1-release

Change-Id: I2ec1785dc4395acc3b73fea29119f60d5686ed07