Merge "Fix typo in UsbManager javadoc." into jb-dev