Snap for 13226929 from 336d7b5d85de3eb97654352c467c9fdb6651feb4 to 25Q2-release

Change-Id: I867a003ffa96672017a54c7cce1a544bab112da8