diff --git a/debian.azure-bionic/config/annotations b/debian.azure-bionic/config/annotations
index 540d3db82832..42c7326e6f2d 100644
--- a/debian.azure-bionic/config/annotations
+++ b/debian.azure-bionic/config/annotations
@@ -94,6 +94,15 @@ CONFIG_VBOXGUEST                                   mark<ENFORCED> note<LP:#17966
 CONFIG_XEN_ACPI_PROCESSOR                          policy<{'amd64': '-'}>
 CONFIG_XEN_ACPI_PROCESSOR                          mark<ENFORCED> note<LP:#1671203>
 
+CONFIG_USB_XHCI_HCD                                policy<{'amd64': 'y'}>
+CONFIG_USB_XHCI_HCD                                mark<ENFORCED> note<LP:#1867002> note<Enable xHCI for PCI passthrough>
+
+CONFIG_USB_XHCI_PCI                                policy<{'amd64': 'y'}>
+CONFIG_USB_XHCI_PCI                                mark<ENFORCED> note<LP:#1867002> note<Enable xHCI for PCI passthrough>
+
+CONFIG_USB_XHCI_PLATFORM                           policy<{'amd64': 'm'}>
+CONFIG_USB_XHCI_PLATFORM                           mark<ENFORCED> note<LP:#1867002> note<Enable xHCI for PCI passthrough>
+
 # From linux-azure initial packaging
 
 CONFIG_POWERCAP                                    policy<{'amd64': 'n'}>
@@ -102,18 +111,15 @@ CONFIG_POWERCAP                                    mark<ENFORCED> note<kernel re
 CONFIG_CHROME_PLATFORMS                            policy<{'amd64': 'n'}>
 CONFIG_CHROME_PLATFORMS                            mark<ENFORCED> note<kernel reduction>
 
-CONFIG_USB_UHCI_HCD                                policy<{'amd64': '-'}>
+CONFIG_USB_UHCI_HCD                                policy<{'amd64': 'n'}>
 CONFIG_USB_UHCI_HCD                                mark<ENFORCED> note<kernel reduction>
 
-CONFIG_USB_EHCI_HCD                                policy<{'amd64': '-'}>
+CONFIG_USB_EHCI_HCD                                policy<{'amd64': 'n'}>
 CONFIG_USB_EHCI_HCD                                mark<ENFORCED> note<kernel reduction>
 
 CONFIG_USB_EHCI_HCD_PLATFORM                       policy<{'amd64': '-'}>
 CONFIG_USB_EHCI_HCD_PLATFORM                       mark<ENFORCED> note<kernel reduction>
 
-CONFIG_USB_XHCI_HCD                                policy<{'amd64': '-'}>
-CONFIG_USB_XHCI_HCD                                mark<ENFORCED> note<kernel reduction>
-
 CONFIG_TOUCHSCREEN_ELAN                            policy<{'amd64': '-'}>
 CONFIG_TOUCHSCREEN_ELAN                            mark<ENFORCED> note<kernel reduction>
 
diff --git a/debian.azure-bionic/config/config.common.ubuntu b/debian.azure-bionic/config/config.common.ubuntu
index f3dab1a6af2e..72e519957c77 100644
--- a/debian.azure-bionic/config/config.common.ubuntu
+++ b/debian.azure-bionic/config/config.common.ubuntu
@@ -560,6 +560,7 @@ CONFIG_CAIF_VIRTIO=m
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_CAN=m
+# CONFIG_CAN_8DEV_USB is not set
 CONFIG_CAN_BCM=m
 CONFIG_CAN_CALC_BITTIMING=y
 # CONFIG_CAN_CC770 is not set
@@ -569,16 +570,22 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
+# CONFIG_CAN_EMS_USB is not set
+# CONFIG_CAN_ESD_USB2 is not set
+# CONFIG_CAN_GS_USB is not set
 CONFIG_CAN_GW=m
 CONFIG_CAN_HI311X=m
 # CONFIG_CAN_IFI_CANFD is not set
 CONFIG_CAN_JANZ_ICAN3=m
 CONFIG_CAN_KVASER_PCI=m
+# CONFIG_CAN_KVASER_USB is not set
+# CONFIG_CAN_MCBA_USB is not set
 # CONFIG_CAN_MCP251X is not set
 # CONFIG_CAN_M_CAN is not set
 CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
+# CONFIG_CAN_PEAK_USB is not set
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_SJA1000=m
@@ -586,6 +593,7 @@ CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_SLCAN=m
 # CONFIG_CAN_SOFTING is not set
+# CONFIG_CAN_UCAN is not set
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 CONFIG_CARDBUS=y
@@ -972,6 +980,7 @@ CONFIG_CS89x0_PLATFORM=y
 CONFIG_CUSE=m
 CONFIG_CX_ECAT=m
 CONFIG_CYCLADES=m
+# CONFIG_CYPRESS_FIRMWARE is not set
 # CONFIG_CYZ_INTR is not set
 CONFIG_DA9052_WATCHDOG=m
 CONFIG_DA9063_WATCHDOG=m
@@ -1208,6 +1217,7 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_SCHED=m
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TTM=m
+# CONFIG_DRM_UDL is not set
 CONFIG_DRM_VBOXVIDEO=m
 # CONFIG_DRM_VGEM is not set
 CONFIG_DRM_VIRTIO_GPU=m
@@ -1424,6 +1434,7 @@ CONFIG_FB_NOTIFY=y
 CONFIG_FB_SM501=m
 # CONFIG_FB_SM712 is not set
 CONFIG_FB_SM750=m
+# CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
@@ -1431,6 +1442,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
 # CONFIG_FB_VESA is not set
 # CONFIG_FB_VGA16 is not set
@@ -1762,6 +1774,7 @@ CONFIG_HID_ASUS=m
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
 # CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CORSAIR is not set
 CONFIG_HID_COUGAR=m
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
@@ -1794,6 +1807,7 @@ CONFIG_HID_NTI=m
 # CONFIG_HID_PANTHERLORD is not set
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
 # CONFIG_HID_PLANTRONICS is not set
 # CONFIG_HID_PRIMAX is not set
 CONFIG_HID_REDRAGON=m
@@ -1909,6 +1923,7 @@ CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
@@ -1934,6 +1949,7 @@ CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
 CONFIG_I2C_SCMI=m
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_SIS5595=m
@@ -1943,6 +1959,7 @@ CONFIG_I2C_SIS96X=m
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_STUB=m
 CONFIG_I2C_TAOS_EVM=m
+# CONFIG_I2C_TINY_USB is not set
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_XILINX=m
@@ -1971,6 +1988,7 @@ CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
 # CONFIG_IEEE802154_ADF7242 is not set
 # CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_ATUSB is not set
 CONFIG_IEEE802154_CA8210=m
 CONFIG_IEEE802154_CA8210_DEBUGFS=y
 # CONFIG_IEEE802154_CC2520 is not set
@@ -2078,9 +2096,11 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
 # CONFIG_INPUT_ATLAS_BTNS is not set
 # CONFIG_INPUT_AXP20X_PEK is not set
 # CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_CMA3000 is not set
 # CONFIG_INPUT_DA9052_ONKEY is not set
 # CONFIG_INPUT_DA9063_ONKEY is not set
@@ -2096,9 +2116,11 @@ CONFIG_INPUT_FF_MEMLESS=m
 # CONFIG_INPUT_GPIO_DECODER is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_JOYDEV=m
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_KEYBOARD=y
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
 # CONFIG_INPUT_KXTJ9 is not set
 # CONFIG_INPUT_LEDS is not set
 CONFIG_INPUT_MATRIXKMAP=m
@@ -2115,6 +2137,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_POWERMATE is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
 # CONFIG_INPUT_RETU_PWRBUTTON is not set
 CONFIG_INPUT_SPARSEKMAP=m
@@ -2122,6 +2145,7 @@ CONFIG_INPUT_TABLET=y
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_WM831X_ON is not set
+# CONFIG_INPUT_YEALINK is not set
 CONFIG_INSTRUCTION_DECODER=y
 # CONFIG_INT340X_THERMAL is not set
 CONFIG_INTEGRITY=y
@@ -2343,20 +2367,28 @@ CONFIG_IRQ_SIM=y
 CONFIG_IRQ_WORK=y
 CONFIG_IR_ENE=m
 CONFIG_IR_FINTEK=m
+# CONFIG_IR_IGORPLUGUSB is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_IMON is not set
 CONFIG_IR_IMON_DECODER=m
+# CONFIG_IR_IMON_RAW is not set
 CONFIG_IR_ITE_CIR=m
 CONFIG_IR_JVC_DECODER=m
+# CONFIG_IR_MCEUSB is not set
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
+# CONFIG_IR_REDRAT3 is not set
 CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 CONFIG_IR_SIR=m
 CONFIG_IR_SONY_DECODER=m
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_TTUSBIR is not set
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_XMP_DECODER=m
 CONFIG_ISA_BUS=y
@@ -2573,6 +2605,7 @@ CONFIG_LRU_CACHE=m
 # CONFIG_LSI_ET1011C_PHY is not set
 CONFIG_LSM="yama,loadpin,integrity,apparmor"
 CONFIG_LSM_MMAP_MIN_ADDR=0
+# CONFIG_LTE_GDM724X is not set
 CONFIG_LTPC=m
 CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
@@ -2645,6 +2678,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_USB_SUPPORT is not set
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_MM=m
@@ -2692,6 +2726,7 @@ CONFIG_MFD_DA9052_SPI=y
 # CONFIG_MFD_DA9062 is not set
 CONFIG_MFD_DA9063=m
 # CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
 CONFIG_MFD_INTEL_LPSS=m
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=m
@@ -2727,6 +2762,7 @@ CONFIG_MFD_TPS65086=m
 CONFIG_MFD_TPS65912=y
 CONFIG_MFD_TPS65912_I2C=m
 CONFIG_MFD_TPS65912_SPI=y
+# CONFIG_MFD_VIPERBOARD is not set
 CONFIG_MFD_VX855=m
 # CONFIG_MFD_WL1273_CORE is not set
 CONFIG_MFD_WM5102=y
@@ -2754,6 +2790,7 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX=m
 CONFIG_MISC_RTSX_PCI=m
+# CONFIG_MISC_RTSX_USB is not set
 # CONFIG_MK8 is not set
 # CONFIG_MKISS is not set
 CONFIG_MLX4_CORE=m
@@ -2819,6 +2856,7 @@ CONFIG_MOST=m
 CONFIG_MOST_CDEV=m
 CONFIG_MOST_I2C=m
 CONFIG_MOST_NET=m
+# CONFIG_MOST_USB is not set
 CONFIG_MOXA_INTELLIO=m
 CONFIG_MOXA_SMARTIO=m
 CONFIG_MPILIB=y
@@ -3160,12 +3198,15 @@ CONFIG_NFC_DIGITAL=m
 CONFIG_NFC_HCI=m
 # CONFIG_NFC_MICROREAD_I2C is not set
 # CONFIG_NFC_MRVL_UART is not set
+# CONFIG_NFC_MRVL_USB is not set
 CONFIG_NFC_NCI=m
 CONFIG_NFC_NCI_SPI=m
 CONFIG_NFC_NCI_UART=m
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_PN533_I2C is not set
+# CONFIG_NFC_PN533_USB is not set
 # CONFIG_NFC_PN544_I2C is not set
+# CONFIG_NFC_PORT100 is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
 CONFIG_NFC_SHDLC=y
 # CONFIG_NFC_SIM is not set
@@ -3381,6 +3422,7 @@ CONFIG_NLS_UTF8=m
 CONFIG_NODES_SHIFT=10
 CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NOP_TRACER=y
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_NOTIFIER_ERROR_INJECTION=m
 CONFIG_NOZOMI=m
 CONFIG_NO_HZ=y
@@ -3804,11 +3846,13 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
+# CONFIG_RC_ATI_REMOTE is not set
 CONFIG_RC_CORE=m
 CONFIG_RC_DECODERS=y
 CONFIG_RC_DEVICES=y
 CONFIG_RC_LOOPBACK=m
 CONFIG_RC_MAP=m
+# CONFIG_RC_XBOX_DVD is not set
 # CONFIG_RDMA_RXE is not set
 CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
@@ -4610,6 +4654,13 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYSV_FS=m
 # CONFIG_TABLET_SERIAL_WACOM4 is not set
+# CONFIG_TABLET_USB_ACECAD is not set
+# CONFIG_TABLET_USB_AIPTEK is not set
+# CONFIG_TABLET_USB_GTCO is not set
+# CONFIG_TABLET_USB_HANWANG is not set
+# CONFIG_TABLET_USB_KBTAB is not set
+# CONFIG_TABLET_USB_PEGASUS is not set
+# CONFIG_TAHVO_USB is not set
 CONFIG_TAP=m
 CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y
@@ -4731,6 +4782,7 @@ CONFIG_TTY_PRINTK=y
 CONFIG_TTY_PRINTK_LEVEL=6
 CONFIG_TUN=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
+# CONFIG_TYPEC is not set
 # CONFIG_UBSAN is not set
 CONFIG_UCS2_STRING=y
 CONFIG_UDF_FS=m
@@ -4768,9 +4820,89 @@ CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_ORC is not set
 CONFIG_UPROBES=y
 CONFIG_UPROBE_EVENTS=y
+CONFIG_USB=y
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ATM is not set
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CHAOSKEY is not set
+CONFIG_USB_COMMON=y
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEFAULT_PERSIST is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_HUB_USB251XB is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ISP1760 is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+# CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+# CONFIG_USB_MAX3421_HCD is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_USB_OHCI_HCD is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+CONFIG_USB_PCI=y
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_ROLE_SWITCH is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_STORAGE is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WUSB_CBAF is not set
+CONFIG_USB_XHCI_DBGCAP=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=m
+# CONFIG_USB_YUREX is not set
 CONFIG_USELIB=y
 CONFIG_USERFAULTFD=y
 CONFIG_USERIO=m
