Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
am: 92a84efba1

Change-Id: I0202f4312aa97c9009842b1e5dbd23555c5b1028