Merge "Implement ConnectivityService TODO and fix many race conditions" into oc-mr1-dev