Snap for 10453563 from c58857dae6e0bf1858beead4f36a303f6e66b1cf to mainline-sdkext-release

Change-Id: I4f1ff90c67a5c09d997bc0447b7e78c251609470