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

Change-Id: Ieebf68d304c5fe7fcbda8e8f43917c3ca153e19f