Merge "[3.0] Fix Svace warning issue" into tizen