[Tizen] Fix merge conflict on previous commit