Merge "Fix logging for HID host and device service"