Merge "Fix Memory leak issue" into tizen