Fixes remaining pep8 issues

Change-Id: Ic902e0a9be7551f0473ef21d0e803739c297f277
Merge "Fixes remaining pep8 issues"