Snap for 10453563 from 8982eba262b52c8300d51876574f8b86951434fa to mainline-sdkext-release

Change-Id: I28a94f778e4e02ce837c71d1f042292463d81836