Snap for 8303596 from 66850c14ed029565115c14f7249c0156a39fb375 to mainline-sdkext-release

Change-Id: I3aa907965862d4e15e1f47892bc28500b96aeb2d