Fixed PEP8/flake8 issues

We need to fix PEP8/flake8 issues corresponding to the new
hacking rules that got added before we can update to the
new global requirements.

Change-Id: Iff995139d258549ff9a8e3e5018e964efa2ab152