Merge "HCI: Add classic interface definitions"