Merge "Split out the connectivity API surface" into sc-dev