Merge "Implement ConnectivityService TODO and fix many race conditions" into oc-mr1-dev
tree: e571232ef804b7887a0a0230b76d37cbbe8023c5
  1. core/
  2. services/
  3. tests/