Merge "Set volume_device_name=vdb for apex"