Merge pull request #1785 from vwadekar/tf2.0-tegra-downstream-rebase-1.25.19