Merge "Cleanup the TetheredClients API" am: 89711eaefe

Change-Id: I3aa44ae9b4d9ec5c34bca067d1ec2486d9dbb2c0