Move disconnect command handling to a common place am: 02242d7b36 am: 93e36ce753 am: 538e3cb5f4
am: 3f817810dc

Change-Id: I3f76eff4d7b3207ddbabf20ff825e737aafb62a9