Remove unused local assignments

Change-Id: I7c5bb0277f0912673f52ef0af79d25aec7d5802f
Merge "Remove unused local assignments"