Merge "Fix unused-parameter warnings"