Snap for 12687986 from 5c59d8c3ea8da5b0c4cc63eea0a26ffa9d131b43 to 25Q1-release

Change-Id: Iaf2117ed8ca8b1d9dc58aced10a8a78dea0bbe63