warning: variable 'i' is incremented both in the loop header and in the loop body [-Wloop-analysis]

The loop is indeed suspect, likely incrementing i too much.

Change-Id: I853aaac44ebf01ae734d8bd3369269ea58d571b7