Merge branch 'upstream' into tizen_5.0_base