Snap for 12370120 from 7e85af82f2c089fc00b20935c311f0796087ada4 to 25Q1-release

Change-Id: I19a3b2b89e41137be528f740c6bdb6365964e841