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

Change-Id: I7aebf6d98939a2fa5f2a52d755b2c8a864d01ca2