Snap for 8303596 from d86dd8b03225cdfa85fbc1e835cc8eb1653c4787 to mainline-sdkext-release

Change-Id: Ib7212a11ad544e900cf51fb5f19d934a20b00e29