Snap for 8720775 from e4819095405163a12bf42aeb40c1411a85216566 to mainline-sdkext-release Change-Id: Ie9a383e3451f0e033ed581ee36e5bc7888763fc8