Merge "Fixed that disconnect message not showing up" am: 2fc6f67431 am: f229354f18 am: fd075a518e
am: 56a99888e8

Change-Id: Ia9508f224ddc09e70c5129179295412919876bd9