PEP8 Fixes iii

Change-Id: I5a094509be96e2fafc070ec0d5bcb5df0d6a524a