am f24ee2bb: Merge "Removed unused variables"

* commit 'f24ee2bb983a1646a058d8c816411d1a83fa2672':
  Removed unused variables