Merge "Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev am: ed6e29f292 am: 063d5e871a"