WIP CHANGES 8

Change-Id: I0e8f95c8382676837512f7a2eb8eb4b68c0c673e
Changes for flake8 compliance

Change-Id: I326edc20f868edbcb90152d2a09941b6e7c178e3