Remove unused local variables

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