Merge "Cleanup the TetheredClients API"