Merge "Add Usb control to svc." into jb-dev