Merge "Seven more Equals/HashCode/StringBuilder replacements"