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

Change-Id: Ib9c8092044c4671374257a4fb0d9e3a430ccc632