Fix unused variables 2/2: enable unused var check

To make code simple and clean and enable unused local variables(F841)
check.

Change-Id: I420e4b3c8845efc616d447922122167af383dbc1
Merge "Fix unused variables 2/2: enable unused var check"