Merge "Merge branch 'upstream' into tizen" into tizen