Snap for 8564071 from 84a12a4d267411fa4a3cac53a4883653181044ee to mainline-sdkext-release

Change-Id: I7b84328305779a02c1812af8d4c3a46e3febc2b5