Snap for 13129673 from 6a9a1363b8d6acc7de7b56a5227d41852127d250 to 25Q2-release

Change-Id: I8e87bcee678725e9b2bc658b20ad4a829d6f1d91