Remove unused variables (flake8 F841)

Change-Id: I716a6b61c2b3faaa23cc79f58c6c6e01cfc232f2
Merge "Remove unused variables (flake8 F841)"