Snap for 12517605 from 706a92ccf207ae8d37b048c31c49d6dcf77c2ae4 to 25Q1-release

Change-Id: I9f70ad881d1d1cbdb9a2336974131ce2ad49f507