Merge "Support lack of ephemeral volumes for baremetal"