Correct the percentage of progress

Guard against division by zero in a better way

Change-Id: I1f0fd3e88c53f32cb0622731a08ecb9bff18568e
Merge "Correct the percentage of progress"