Snap for 13112829 from 23ef48c890dc39c8c8fae646721243db88fa9a53 to 25Q2-release

Change-Id: Iadb807ca04acd9b64a9fd072a16b4522d83d0f28