Snap for 13135932 from e16006c2ba5be4a2dbd9c4a5f5a563687dddfb53 to 25Q2-release

Change-Id: I1531a3b9481a737112d6c6271cfcdc7236808338