Merge "Remove ArrayUtils usage in connectivity classes"