Merge "Fix incorrect ParameterizedType behavior"