Merge "Add test for equals and hashCode in ParameterizedType"