fix -Wunreachable-code-loop-increment am: e51ddb3fb6

Change-Id: I470b39290db53f496c2328e196ddfcf82a3b3ada