Merge "Fix accidental non-translatable string" into nyc-dev