Merge "Revert "Fix prevent defect for locales"" into tizen_2.2