Snap for 10453563 from 90f8ec85746d01057064e7c670e23c1cf66e73fe to mainline-sdkext-release

Change-Id: Ifbf3ab17a30a80fc4a8743de6fce4ea02cf293a1