Snap for 12680993 from 164787b6eb63c274dcd9872fdbd03e8d7f8d59c0 to 25Q1-release

Change-Id: I3616d81105387cf506d90f21a613d436aabc9634