Revert "Trimmed the branch to only the tf2_py sub directory"

This reverts commit 0d303cb2f55a68e76f1a0a81d869a1f2b5cb47e8.
Rebase from 'upstream'
Trimmed the branch to only the tf2_py sub directory