Merge "fix -Wunreachable-code-loop-increment" am: 33fe26ea am: 650e783d am: 374bfacb am: e2b1b8ae am: 2c6d1092 am: 28937b4a Change-Id: If09735209e51cd63090eb8754c2ac26fdd262dde
mentioned in commit 1b96ac32