Merge "Fix warning when force-disconnect but there is no connected API" into nyc-dev
am: 82a7ddc4b1

* commit '82a7ddc4b1ddc76df553c2633ce3bfe72bb9319b':
  Fix warning when force-disconnect but there is no connected API