Snap for 13264465 from f8e2f9dad2be97a039a7e3d80c0e325683455c15 to 25Q2-release

Change-Id: Ic6f36fae918df83b922c84bd0fdfc9648c04e9e8