Python lints to pass flake8 tests

Change-Id: I644de0fc88748a7d07d176662ada2539157b353e
Merge "Python lints to pass flake8 tests"