Snap for 12337407 from 5476d8e2e73bab2da9b2ad6613d7cd0286f1b3eb to 25Q1-releaseChange-Id: Ie0bc3c119165904532068a1ddf1a5f669667e56a