[automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am:...
[automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 389714de -s ours am: 18bb1ac5 -s ours
am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 3d330ffd is in history
Change-Id: If3eee293fcc89cf0ccce7e0954651d23dc1c8162