Merge "Add type aliases required by TF rebase" am: dc803e1bf6 am: d7f311952e am: 0f0707afca

Change-Id: Id2d9e983356fdba61dee155f56e68c2d126c48ed