adding support for disconnect.

Change-Id: I9cf93d92d81d4909ee29cb9c5b6529700b308d55