Fix pyflakes/hacking errors.

Change-Id: I6c364240d9e336fc4f38c2f4bc1fea2ae5e91511
Merge "Fix pyflakes/hacking errors."