Merge "Add NYC version code to VersionCodes."