Merge "Tegra: Fix typo in comment" into integration