Snap for 12415101 from f5714487a6fef93234cf677bf0dba619d95d2f34 to 25Q1-release

Change-Id: I842ff5f23daeee9f28f304547ae27d664c8c6382