Snap for 12502765 from 425be06017d7858a70342c9a785ff4709247cfc0 to 25Q1-release

Change-Id: I4a800c2e21a9622e997c06f36b1f8ae7e4cdc8f1