Merge "Fix warnings about unused parameters"