Merge "O MR1 is API 27" into oc-mr1-dev