Snap for 10453563 from 9df12251ffa5aab3bf744c16004a0faffd796d41 to mainline-sdkext-release

Change-Id: I8dd5c4dd2ca9b3644976bec4111f46086b369c2c