Merge "Remove ArrayUtils usage in connectivity frameworks classes"