Fix for build errors with -Wunreachable-code-loop-increment flag am: 750dd58c8d am: ce1b551e99 am: 514510a33c am: b1c1f8d97d

Change-Id: I61d05e38cdef61c3c002ddef5cc93d0ac265deca