Snap for 12687986 from 6c86177f7b122d8868425b06f9c03a0011aa49c8 to 25Q1-release

Change-Id: I1497a49e159752d1d722c6061cc4aca788949586