Merge "Remove hidden connectivity API usage in tests" into sc-dev