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

* commit 'ad6f4996dc909dcb8e6e369bf41be514077fb142':
  More volume UUID awareness.