Snap for 9886856 from a8b1d53a685ad68f92e071895f9d3fcdc53f0323 to mainline-sdkext-release

Change-Id: Ib72b8afd0ef8b54b2cbeaa16ad22282dd8d7d9d4