Merge "Fix unused-parameter warning"