Remove unused variables

Change-Id: I1955a995dec976ec05b06133a51e6c50ca9f93fc
Merge "Remove unused variables"