Merge branch 'next/topic-plat-samsung-1' into next-samsung-cleanup