Merge changes from topic "tether_migrate"
am: 254a71dd7b

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac
tree: 72cd70e35834e8d651bd0d8a5eb4ed9b79dac4f4
  1. core/
  2. services/
  3. tests/