am 2eda70bd: am f458ba7d: Merge "Don\'t call ComputeEagerResolvedStrings"

* commit '2eda70bdc374e0eea702d504943bb9f908ded4fa':
  Don't call ComputeEagerResolvedStrings