Snap for 10453563 from 3bcd6a5bd79717fd982b3c94abe4d6224d5a908a to mainline-sdkext-release

Change-Id: I923a1b9aa97cfef447f187514c1d872c4cda0da8