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

This reverts commit 7f816a0bc9cb16677b0ad3a86462b1657dde9189.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tf_conversions sub directory