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

* commit '6d4af736d09fcc7165d3e36bc86b7292d76ad1a4':
  Fix native crash when driver commands time out