Merge "Fix ConnectivityServiceTest fail."
am: 362d9fb687

Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c
tree: e60b9585e9b167c54bc340a984411dca9f647470
  1. core/
  2. services/
  3. tests/