Merge branch 'upstream' 5.5.0 into tizen