Snap for 12525705 from 018155540f67254e0ba08564eb7660c13e29b704 to 25Q2-release

Change-Id: Ia07b537e0c38c9f44f598ab0cc3d12b000059100