Merge "Fix the warning errors" into tizen