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

* commit '1408b9c5b339a368e20ca8f7dac019e56f19089d':
  Preserve retryCount when retrying.