Merge "fix -Wunreachable-code-loop-increment" am: 33fe26ead4 am: 650e783d44 am: 374bfacb2f

Change-Id: Id57699fc7932ebb09d60b33f97e8c3855dc61052