Fix for build errors with -Wunreachable-code-loop-increment flag am: 750dd58c8d

Change-Id: I596bac88cd2e19078176b9cafb4d7e1ba0ee78bd