Snap for 12508860 from 163424eacc9da44f65d493c0190dd05eaa840f3f to 25Q1-release

Change-Id: I56f29ed08987878dcd5caba69132e5474437fa9e