Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev