Merge "Finalize O-MR1 compat matrix." into oc-mr1-dev
am: 0289fc42b4

Change-Id: Ifdcd03b5fb9c96f096b89262efcb7a20fc2a407c