Remove unused local variables

Change-Id: I9e5667d3b27c7685004e2f3215ea51176988d3b2
Merge "Remove unused local variables"