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

* commit '36481749e61cf6286630a86699c16c595a13450d':

Change-Id: I058ff76e2c092fc38097c65860b33c4db35cca4c