Snap for 10453563 from 5dc6cb253ed0f313cededbdb0932be2c73032bad to mainline-sdkext-release

Change-Id: Ife3ec309b50cf136b5c23b8c2da24bc1ebab9296