Merge "Removed unused variables" am: aa83832
am: 64e821b

* commit '64e821b085c6cb49595fbd0e4e022fd066b38caf':
  Removed unused variables

Change-Id: I8b8c5493377730e3e2f74d080ec34017c9132eb8