Merge branch 'treewide/cleanup' into late/tegra