Merge "Remove usage of IntegerRes in type usage target"