Pep8/Pyflakes fixing

Just avoiding the error popups in the editor that way.

Change-Id: Ic0cb903dfb0e9eff6b12d004da720919f6f1a009
Merge "Pep8/Pyflakes fixing"