Merge "Split out the connectivity API surface"