Merge "Skip connectivity unit tests before S"