Snap for 12445464 from f2a717445d3a8a1aaa5aeef1cb2e9a4bc739e9b1 to 25Q1-release

Change-Id: I44add8c8aa4c55bd46ad8d6183610c27b29f36be