Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2