Snap for 12748980 from 0f6c76b39c3597b5824793a4d173dd73eae151f6 to 25Q1-release

Change-Id: Ie8adf19d20950a51e6f4e60e99d0a30318ea4113