Fix integer overflows in recovery procedure. am: 1273956e am: 5978a71d am: 877dcba4 am: f4ee1720 am: cae056f2 * commit 'cae056f2': Fix integer overflows in recovery procedure.