Snap for 12858568 from fe610be4814a0109893e886b8848a3cf2289bbe8 to 25Q2-release

Change-Id: I96d49257bfe63a92b851382354c99c7545e49e08