Merge "Do Not Merge. Don't connect to non keyboard HID devices." into honeycomb