Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7
am: 60acc3e6ab

Change-Id: I105a361b58b19c1102bef2c88a0ad5f281c793c6