Snap for 10758424 from be44578eea25458cbe534b749fd4d72a4d6a1c81 to mainline-sdkext-release

Change-Id: Ib650ee2e6d8905eca3142d32887ea31410a0b8c3