Fix flake8 errors in anticipation of flake8 patch.

Change-Id: Ifdc4322b699f2bd91a6900e55695acd3d736568e