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

Change-Id: I2c4b2b51dd9b255a3745e08e9260bd13df8fdc9e