Remove unused local variables

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