No idea how this happened, but reviews started failing the
pep8 gate job. The failures are legitimate, see the commit.
I guess the pep8 tests became smarter and found these issues.
Change-Id: Id9a0dad644134dafd68eed37fe8f41c583d7a619
(cherry picked from commit 52ff421e3d)
(cherry picked from commit 37e2c536e4)