Merge "Add -Wno-unused-parameter"