Merge "Fix the svace issue - DEREF_AFTER_NULL" into tizen