fixes some problems pyflakes complains about

Change-Id: I1eb16fa595b0b1d97ae14279b8aa25bd2740f511
Merge "fixes some problems pyflakes complains about"