Merge "test out the new disconnect api" into nyc-dev am: 72c7247
am: 3209439

* commit '3209439506faa1952773c6d0437350c1e9726782':
  test out the new disconnect api

Change-Id: If061abc39958e6b71c16c661fe54a6ff56ea5655