am 37f5fa5a: Merge "Fix disconnection event processing" into jb-mr1-dev

* commit '37f5fa5a8706c16490dd841c280bc015f79d81da':
  Fix disconnection event processing