Merge "Removed unused variables"
am: aa83832

* commit 'aa83832f946d8c85308f84172f9494802263f9b6':
  Removed unused variables

Change-Id: I96bd3d878b96a228061cb21646f43b189b75ba75