fix -Wunreachable-code-loop-increment am: 8aa2801d64 am: c481d1cc3a am: 8efa8acf90 am: b8d22b711a

Change-Id: I386cc5b1aff9d80ca5be61b0002c85c2bfcf371b