am e0205d51: Merge "Remove ResolveString from MethodHelper."

* commit 'e0205d519dd417f749243b42b8711dfa313e5390':
  Remove ResolveString from MethodHelper.