Merge "Fix security issue" into tizen

No match.