Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev