am d2246930: Merge "Preserve retryCount when retrying." into jb-dev

* commit 'd22469302707d87ee56d7a30dd8b38e671ee0179':
  Preserve retryCount when retrying.