Enable: F811 redefinition of unused variable

Closes-Bug: #1398548
Change-Id: I7c6f736255e7bdad376d20eb80b2bbfdcd5aea0c
Merge "Enable: F811 redefinition of unused variable"