Merge "Use connectivity resources in service-connectivity" into sc-dev