Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev am: 44b24c9b38 am: 36481749e6
am: 849473031b

* commit '849473031b30e0a15ae71c566dfbfae7b5fbc105':

Change-Id: Ifcc1a622b09752d314c55c1bb0258f9087b07cde