Snap for 7570015 from ca815c709ef8029c6f26d4f59900e5396633867e to mainline-sdkext-release

Change-Id: I26c84631d3c12a21af1c65e1e30e721bfbc12b47