Snap for 13097162 from 76713b505b0d752c78393d227ba8815daf07977f to 25Q2-release

Change-Id: Id1f2b0bf946e1d8852f84c549ee2a319a80e400d