Snap for 8564071 from 7d19bccfe157d2a9d2872530f6d7602a8d7742de to mainline-sdkext-release

Change-Id: I218322c560952210637bd5788d3dd56c413387a1