Tethering improvements.

Changes due to comments.
Fixing Tether teardown.

bug:2422545
2 files changed