Merge "usb: Add owner file" am: 75b87347aa am: 576cd45e62
am: 2d329121fb

Change-Id: I335f5b2349bf9ee2fa808135c02c594f86b5e049