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

Change-Id: I6d76d35678d3a1cbbab3fe0290540fa5fe3c80ad