Merge "Finalize resource IDs for N." into nyc-dev
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: I6eb87bf4e6ee41ea32e497562635a8432b85ba59