Snap for 9701827 from a8f11449e970fd27b9f646de5122741bf729ee8d to mainline-sdkext-release

Change-Id: I9fe2a6f6cbab50f093282db5d0f063a977a37253