Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61
am: 0a23c1a995

Change-Id: Ib501fa0ed255de6ac64aae58ad12eaec4889d46e