Snap for 12517605 from d6580b100b3be9f36c4b1e68e6e356c1df088f82 to 25Q1-release

Change-Id: I9b777297da5768eee0e03b938fe607d5c4c1162d