Merge "Allow apexd to access a new dev_type: virtual disk"