Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev
am: eb74a38bb8

Change-Id: I38e5a43144de5d5a49de29ab5ec4f9b8cfa103f0