Merge "Remove private reference to ArrayUtils"