Remove unused local variables in tests

Change-Id: I71318eb7d8c00bfc1ce6d2fc636b498f7a695f42
Merge "Remove unused local variables in tests"