Merge "[USB] Fixed interop code for proper marshalling"