Merge "Some cleanups for Tethering" am: 7cf4907b89
am: 997009af45

Change-Id: I0e00187f9a5eee9e55f961ce0458c9b91af19fb7
tree: 72759618672f384b5fa072fcfd8c1671d026bf4d
  1. core/
  2. services/
  3. tests/