Merge "Five more Equals/HashCode/StringBuilder replacements"