Merge "Remove the last of the ResolvUtil uses"