Snap for 12727401 from 25bfff2f4568a2d3e8149091a1dc8052b85f9dee to 25Q1-release

Change-Id: I8f64deb3ef195430a31f5c1b817f5d7dfc5d3742