Merge "usb: Add owner file"
am: 75b87347aa

Change-Id: I9a56bb1d38634494dbc48446b313bd4077b4862d