Merge "Fix some (but not all) unused parameter warnings"