Merge "Remove ResolveString from MethodHelper."