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

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