am 86e9cf0f: (-s ours) Merge "Revert "DO NOT MERGE: Remove unused variables"" into klp-dev

* commit '86e9cf0f703ad94ed6cbf4d09132f6f15f0d31e8':
  Revert "DO NOT MERGE: Remove unused variables"