Merge "Remove build warning" into tizen