Snap for 12680993 from a3482992c451ea8ccf9dedf52ffa289e5957de18 to 25Q1-release

Change-Id: I576955c9915b07407ea6ddaed57d92109a61df11