Snap for 10453563 from f847fd7131b17b32364e9e4d7c26fafa03eb2dfd to mainline-sdkext-release

Change-Id: Ida0b90bb80b9c74907a30665fda6b17a4fb575a6