Merge "Remove unused parameter" into tizen_5.5