am 69c8d39d: Merge "Clean up unused parameter warnings."

* commit '69c8d39d1f9ebb55844ad7794d12fedf8b5be5bf':
  Clean up unused parameter warnings.