[CA-137573]: Fix "Unrecognised bus type" VDIs.

Backport of #66