Snap for 13264465 from 6f30f2af8890b62da7b9e37eca53b300909f70a1 to 25Q2-release

Change-Id: I27638d0a3cca34a29261009d1e17d542bc73b9f8