Revert "Revert "Remove unused var""

This reverts commit 5f0e075602e016cc37390e27f1024d8af9fb9e39.

Change-Id: I83485305f580c8995a35943f6dbaf49c47aa7a5b
Merge "Revert "Revert "Remove unused var"""