Snap for 12492053 from c7d1acf0eb70ad3da7f91238c294279f2deb4474 to 25Q2-release

Change-Id: I4af84d67fb200db23be34d4e7cb6b21c4f698a9e