Remove unused variable

Change-Id: I000d6255c5ada5f41dc8e8f9783dea11c1acfca8
Merge "Remove unused variable"