Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev am: ee1661f7cd
am: b407389280

Change-Id: I5f11191b063ab17e6d5a3a9edf6cc8cf34272638