Fix pep8 issueswq

Change-Id: I072e56116a5a6e7dd20c272bc292e56d3ec74872