Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev am: 1d66ccde36
am: f6791675f2

Change-Id: I33c1d2cbccb2e2944bba49d8b7d6b5117816870a