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

Change-Id: I1bb3bc5f0db563797262a8e4485f4ede25db4c99