BUG: Fixed bugs where counter was being over-decremented.

Small bug in the loop logic caused SkippedCells to be over-
decremented, preventing the iterator from moving to the next
cell.

Change-Id: Ibc42a4a40bcc16e794e6aa5082693bfdeeb2fb7b
Merge topic 'skippedcells-fix' into master

a4c85d8e BUG: Fixed bugs where counter was being over-decremented.