satisfy some pyflakes errors

Change-Id: I225820df4f48f50c447ac6548787a5acabac6634
Merge "satisfy some pyflakes errors"