Merge "fix -Wunreachable-code-loop-increment" am: 1d0e52cf31 am: a093f06459

Change-Id: I2f113b184e487f15860b1bbd715ff274a0db2d15