Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: d63315e535
am: b19774bd32
* commit 'b19774bd321059c698c8a30867eb56d86097e16c':
Change-Id: I1e301f4500b46a9135a048916f063f00989dd4a9
This commit is contained in: