Merge "Fix Svace issue : 150354, 150355" into tizen

No match.