Merge "Some cleanups for Tethering" am: 3f3d4bcb82 am: df676cf2d7
am: de38107021

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