Snap for 8564071 from a63ec7d2a65b0c8fbe4e57a9bebd17015c1e1b57 to mainline-sdkext-release Change-Id: Ib37541b8abcf960d27b40a9a0433f786a4a3cc46