Snap for 9051867 from f3f6f103b683df8c1e0a96bbbdfe1c5603eae38c to mainline-sdkext-release

Change-Id: I607ea7ef7babeb4a6db41d4da998356676e741ee