We can't depend on pep8 not to add new rules and break our tests. Change-Id: Iac5c79f7c00fcaeff3ef957d138754d63425a256