Merge "Re-skip connectivity unit tests before S"