Snap for 10453563 from a7b0c2a34645253966c39c9d031d8d4e50d92cdc to mainline-sdkext-release Change-Id: Iea90ba56305e0e704ef6260b0edf09c502e0a353