Merge "Add test for equals and hashCode in ParameterizedType" into lmp-mr1-dev