Snap for 8564071 from 24832cd6d3fa0cfd7aab8ff6e938ce9f64cd9373 to mainline-sdkext-release

Change-Id: Ia87115b551aecca53075647ebbf7f90ef33783c0