Fixed some line-length and whitespace warnings.

Change-Id: I43e4597eccc7a400bad6674ec803028a53e409ad
Fixed pyflakes issues.

Change-Id: Ifa63142b5587846e6c61c9337a9b85489e0f8b87
Merge "Fixed some line-length and whitespace warnings."
Merge "Fixed pyflakes issues."