Merge "Remove hidden ArrayUtils usage in test"