Merge "remove unused parameter in methods"