Merge "Fix Darwin build caused by -Wunused-parameter."