Merge "Fix logs" into tizen_2.1