Snap for 10453563 from eb0d26b5d9f59abe522bcd0e4ffe43187fab7ac9 to mainline-sdkext-release

Change-Id: I77a169a841afe259353ae9a9af3fe3bb75cba759