PEP8 fixes.

Change-Id: I629748c5a606dff5c3fc45809914f3390d612db7
Merge "PEP8 fixes."