Merge "[4.0] Fix SVACE issues" into tizen_4.0