Merge "Pass both partition GUID and filesystem UUID."