Merge "Removed workaround codes" into tizen_2.1