Merge "Add codes to avoid memory leak" into tizen