Merge branch 'tegra/cleanup' into next/cleanup