Merge "Strings for post-upgrade." into nyc-dev