Snap for 12687986 from 26c482de48f1f263835baff41ccd72578fd8128b to 25Q1-release

Change-Id: Ifa06ef11df1bb2c2386d5fe1f9ab8e98f971ab03