(no-ticket) Fixes for compliance with pep8

Change-Id: I4f0765d2864a2fef26efbd9b5532db8d95dbe1ba
Merge "(no-ticket) Fixes for compliance with pep8"