Snap for 12755599 from 62098bc0354d60d0a4e4306b98cdafdb7ceaeef7 to 25Q1-release

Change-Id: If90aa974d1dd0ea9399128ac8549a9abf96ba2a5