Fix integer overflows in recovery procedure. am: 4f2df162c6
am: 2800876140

* commit '2800876140425749d8d3fd8339f5c4b55ee0e185':
  Fix integer overflows in recovery procedure.