Merge "Fix SVACE issue @SVACE ID WGID: 30779 & 30802" into tizen