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

Change-Id: I80f21d5df3b37c27a9c56c1412ae942b88264349