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

* commit 'f27b55f1eba83c4ac222fa08dc958f82c6ccbb3d':
  Don't call ComputeEagerResolvedStrings