Merge "Don't store class in InstanceCountViolation"