am 06eda4e2: Merge "Fix native crash when driver commands time out" into jb-mr1-dev

* commit '06eda4e2d5cb8aff7253e6be111553086fbc9b82':
  Fix native crash when driver commands time out