Snap for 10453563 from 8e4d2330aa4e28e0a5bf78fc3f75d615832d46a7 to mainline-sdkext-release

Change-Id: I1413d477b8db4da1ca5780187b94b001534168f5