Cleanup unused local variables

Change-Id: If70cadae0d9b0ff1b8c77d0ddef231d5334f4281
Merge "Cleanup unused local variables"