Clean up local variable usage - Zaqar

Change-Id: Ie274ce587134d3a3a928a3825dc4452298c5c4d0
Merge "Clean up local variable usage - Zaqar"