Merge "fix build break" into tizen