Merge "Updating Eth CTS to account for existing ifaces" into tm-dev