Merge "Cleanup the TetheredClients API" am: 89711eaefe am: 7d28e4e36e am: 2c655ed0a1

Change-Id: I5cc55bc3bb5b142f9c6b6fcbce68e1c232c7c5a2