Merge "Revert "Skip connectivity unit tests before S""