Snap for 8303596 from ade186f2f14d15279c0c06d7b93c21f86ca3e990 to mainline-sdkext-release

Change-Id: Ic85577bc78478034a48b74d3f9a7b82d5997d7bd