am 7d587c31: (-s ours) Merge "Silence warnings about unused parameters."

* commit '7d587c31d5c9a2f76f69073036f521dc75045656':
  Silence warnings about unused parameters.