Merge "Add type aliases required by TF rebase"