am f3c2eb79: am d6344d76: Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev

* commit 'f3c2eb79e4660692d85cc531c2825bff65270242':
  Work around a possible driver bug Bug #7296475