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

Change-Id: I133cdcd293ca15a2b9e5ee1e3d36f881e710c3ed