Snap for 12763142 from 84544dd1f56633579b57431c23c3cdeb286468c8 to 25Q1-release

Change-Id: I981e306b5cd988cc1d6f3186b7cac2fa9fc57dd9