Merge "Don't call ComputeEagerResolvedStrings"