Merge branch 'upstream' into tizen_base

No match.