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