Snap for 8564071 from 150ecf3f41853af1de320c17c042e87bc7c2a748 to mainline-sdkext-release

Change-Id: Ic05f40aa72e3f03ae1fb3d509f6d5c37558c77d7