Fix code to pass pep8 Tox environment.

Command tox -e pep8 is failing making CI to fail: this fixes it.

Change-Id: I5b1acfc4ba2e0eb16f50bfd1cdaa8edc361923d1
(cherry picked from commit 2d6bcaa7e55be9fd070bade12824709ac848f8fe)
15 files changed