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

* commit 'f458ba7d9c04bc8d499532b5470af28db18e4149':
  Don't call ComputeEagerResolvedStrings