Add type aliases required by TF rebase

Test: mma
Change-Id: I6c54139b6f6a833c3688928d56fc3513f7b1586a
1 file changed