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

Change-Id: I2db7c5b73f6b4af128dda75150f7bd2ebeeb653c