Fixed some pep8 issues.

Change-Id: If3b013e0d8a105f8e49f3cb31b7549f357fae3a8