am d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev

* commit 'd86a532c5271dfbfe7378ddeb6700fafd92ecbcc':
  Fix handling of lost device