Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev