am 5ebf04cc: Merge "Bug 6605167: Turning off FUL during error counts as attempt" into jb-dev

* commit '5ebf04cce420ca8f32270245189c4d71f28cfd27':
  Bug 6605167: Turning off FUL during error counts as attempt