Merge "Finalize resource IDs for O-MR1"