Merge "Merge branch 'tizen_base' into tizen" into tizen