Merge "Handle alternate status values." into oc-mr1-dev