Merge pull request #849 from vwadekar/tegra-changes-from-downstream-v2

Tegra changes from downstream v2