Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev