Merge branch 'tizen' into gtest