Merge "Public volumes belong to a single user." into nyc-dev am: d537f76b88
am: 930e77314b

Change-Id: I0dfbf6667e2a8c9f696274aaca08124b6a41d378