am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev

* commit 'cd6ba4120c346842f82e8c4a710e9c4e26db3b67':
  Pass underlying volume UUID to StorageVolume.