Merge "Split out connectivity-t-pre-jarjar and tests"