Merge "Don't reference framework strings." into nyc-dev