Merge changes from topic "tether_migrate"
am: c0c88f7a92

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac
tree: fc21f3417c9ad8621bd1f17710240bc7d26a0104
  1. core/
  2. services/
  3. wifi/