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