Snap for 12637843 from ea38f5c687cd74241cc46c809bc68ba73693cda4 to 25Q1-release

Change-Id: I1c8956ef66e1054578a1874c5a39695bb59f4943