Merge remote-tracking branch 'usb/tizen'