Merge "Fixed that disconnect message not showing up" into oc-dev
am: 32c85c7e47

Change-Id: I2e221d8abbb717af31fcaf5c232063c3cbfde20f