Merge "Remove build warnning" into tizen