Merge "Cleanup the TetheredClients API" into rvc-dev