Revert "Remove unused var"

This reverts commit ec622726d0259079b96e3ffd89534cb2482a6455.

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