Merge "Six more Equals/HashCode/StringBuilder replacements"