Snap for 12597516 from 67ab86b040eeef56afe19c7b36ae4200ff62cb83 to 25Q1-release

Change-Id: I1c6ec4a24b8198dfcab87f734fe1fa11890ffd99