Merge "Update references to O MR1 to proper codename." into oc-mr1-dev