Snap for 11173240 from d4acff6182b294718056de99b67128576b2b7f9e to mainline-sdkext-release

Change-Id: I3417c8986e13905865b56c1fe5977d722f2546e3