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