Merge branch 'samsung/cleanup' into next/cleanup2