Merge "Fix divergent equals and hashCode behavior"