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

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