Remove unused local variables

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