Merge pull request #845 from vwadekar/tegra-changes-from-downstream-v1

Tegra changes from downstream v1