Snap for 8303596 from 9436194c79a6d9681d3109de641476c7a0f0d971 to mainline-sdkext-release

Change-Id: I7f0e43c77be0a0037ba687e3b69b088bbd5fc379