Remove unused variable

Change-Id: I95c360f9adabfe2caa48cc0b88dae5642ca863ad
Merge "Remove unused variable"