Snap for 10453563 from 1ed1e0c89b5956db27834f9339bd9149a53034d0 to mainline-sdkext-release

Change-Id: I96fc0adda6b729012156469a2aa1f0641820d18b