Merge "Adds ERROR state to ImsConfig"