Snap for 12482619 from 42b743340a5ea7d7cc676776f5b7ac51895f8d96 to 25Q1-release

Change-Id: I5da3a3c1ad627c03b746cad70fe6608963c54de7