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

Change-Id: I0f5c8f33f13dfa2366992a2b2e0ada7667b90e2f
tree: eb13c05c3e9f82a6f55df60c58b81951564693e7
  1. core/
  2. services/
  3. tests/