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

Change-Id: I40a2a44dee8a359f3af8af61a2223ab77046aa74