am f505dae2: am f2879ef6: am 6698ebf9: Merge "Fix Darwin build caused by -Wunused-parameter."

* commit 'f505dae2d53b12ef9a991eb8bae9fd8290a965fe':
  Fix Darwin build caused by -Wunused-parameter.