Merge "Fix typo" into tizen