Merge "Fix string typo." into nyc-dev