Merge pull request #913 from vwadekar/tegra-fixes-from-downstream

Tegra fixes from downstream