[automerger skipped] fix -Wunreachable-code-loop-increment am: bbdfd078 -s ours am: 1ac2b2f9 -s ours
am skip reason: Change-Id I1d1cd62471dd57eace18c804c315bb2285b127b1 with SHA-1 b73196bd is in history
Change-Id: I682c2b2730a28c4e9a7572247c159dafa9698a47