Merge "silence -Wunreachable-code-loop-increment"