Merge "Do not update state of Disconnected Connection" into nyc-dev
am: 764e856

* commit '764e856a4076f138080472d77c20e9bfde30afa7':
  Do not update state of Disconnected Connection