Fix pyflakes errors. Two remain because they are not real errors.

Change-Id: If672638df066d717142ae09eb23f88cf0ab43a15
Merge "Fix pyflakes errors. Two remain because they are not real errors."