Merge "[WGID-200328, 200330, 200606] Fixed some codes for secure coding" into tizen