Snap for 10453563 from a96f9a905896fc43a8eff643c60a608ee2797d92 to mainline-sdkext-release Change-Id: I38069d27b88f369023ad05a8403ec093638e602f