Merge "Merge "Cleanup the TetheredClients API" am: 89711eae am: be7c8955 am: 1f6a7308 am: 53f2f871 am: 8e0e9d69"