Remove unused local variable

Change-Id: I53b72da086296668d17d95e05cbe58a1e873b2d4
Merge "Remove unused local variable"