am cbde9b92: am d107c305: Merge "Plumb through volume UUID when building paths."

* commit 'cbde9b920461225b5400abf5700eec1b62f5ce82':
  Plumb through volume UUID when building paths.