Merge "Some cleanups for Tethering"
tree: 72759618672f384b5fa072fcfd8c1671d026bf4d
  1. core/
  2. services/
  3. tests/