Merge "Fix memory leak issue. (Checked with valgrind)" into tizen_2.1