Snap for 13210474 from 473e40ddae9945e7f2321f5b6fa25ae194873cd7 to 25Q2-release

Change-Id: If1eb03434d6cd402dce65815663e77c4a2ca41ab