(no-ticket) pep8,pylint

Change-Id: I07d1ce8d5342cf5c587881b32022f6046a161797