Merge "Disable -Wunreachable-code-loop-increment"