CP-6172: Add updates for vbd3 devices