Merge tizen branch into tizen_3.0 branch

No match.