Fix and enable F811 pep8 rule (redefinitions)

Change-Id: I4578a6ee77e2c875fa0be03763a5176fc0075198
Related-Bug: #1333290
Merge "Fix and enable F811 pep8 rule (redefinitions)"