Move disconnect command handling to a common place am: 02242d7b36
am: 93e36ce753

Change-Id: Iec42065323b2f4ad13b0dd7bb928115d3e21242d