Merge "Finalize O-MR1 compat matrix." into oc-mr1-dev