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

Change-Id: Ie7b34d91f91109f909af486fdb2affaacc7d544b