am 25327881: am 066fadb9: Merge "More volume UUID awareness."

* commit '25327881e339bd88045e0ecf17185d2edb479d7c':
  More volume UUID awareness.