Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: 82a8c5f246
am: 7eb543ef2c
* commit '7eb543ef2c8ea8ce1307fd3839386b677e3013da':
Change-Id: Ie54ecaaa34938fbf84155e56f70ccc96f2ed6901
This commit is contained in: