Snap for 13197820 from 9c86256020a3b0b1c03dec98f80c934eea3c3512 to 25Q2-release

Change-Id: I42895d78dbe2704be782ff7c82602e1779f3a093