Merge "diag: Support dynamic switch between USB and PCIe interface"