Fix more pep8 issues.

Change-Id: I8d5974ac5053e599407e388c396482d180a79abd