Merge branch 'upstream' into tizen_5.5_base