am 8e5fdac4: Merge "Mark 2 unused paramters as such"

* commit '8e5fdac4de722d4f1333471a5a60412a0db2d1df':
  Mark 2 unused paramters as such