Merge "remove compile warning" into tizen