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

Change-Id: Ib842d54d3ad4698dc9d24f81edc37caf38cedcac