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

* commit '0297d4300c1fe16ebae329c4d5350d9166261b07':
  Revert "DO NOT MERGE: Remove unused variables"