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

Change-Id: I69d0049ff5684a182015c34a6973d5af5e125147