Gate on F402/pep8

rename instances of loop variables to prevent them from shadowing
imports. This strict check was added in hacking 0.9

Change-Id: Ib5e162b85e3c6931f213731c3febd3dd8ba0b4b1
Merge "Gate on F402/pep8"