am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev

* commit 'c48ca657f801b120e88c94287cdeecddc1a46e88':
  Fix driver stop handling