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

* commit '9998f77a75ec9d56b2bc4510f7b4ff1952f4f900':
  Fix driver stop handling