Snap for 13210474 from 37db639f904934f365eb6a9fae9d99136c7f3f48 to 25Q2-release

Change-Id: Ife2ee743abe904de0baae765e38f4a47434c86d1