Merge "Allow Connectivity usage of core-tests-support"