Snap for 13017112 from fb3a457ed8a3d3c8aaff4e6db7ea1201a521a705 to 25Q2-release

Change-Id: Iccc371c4baa970f2ab7b5856421457f06d007474