Code cleanup in advance of flake8.

Change-Id: Ia2b463fdf3092aa72147eeda41faad4733fddd46