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

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