Merge "Revert " Manage when the string length is zero"" into tizen_2.1