Merge "Simple cleanups to Tethering"
am: 7eaa2ad172

Change-Id: I3bb7e4756eaa0b7e702ff7270beb7420b7b6aac5
tree: 7ab6bce0f1a2075b9bd3be5318b069008f558ae9
  1. core/
  2. services/
  3. tests/