Merge "Plumb through volume UUID when building paths."