Merge "Fix use of Object.equals() to compare arrays."