Merge "Disable -Wunreachable-code-loop-increment" am: 3dccd10bfa am: c240284279 am: dafa5d1b33

Change-Id: Icea4f01e5a0568656c8732a23778f1570eafac56