Fixes PEP8 errors as reported by pep8 1.3.4

Change-Id: I8453567f49e8673b2cc6bfe090044dbdb8d3520f