am 123ad6d1: Merge "Remove unused parameter warnings." into klp-dev

* commit '123ad6d12c6892c245899cc6b61d5cc7782c3203':
  Remove unused parameter warnings.