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

Change-Id: I587ecb5f31246677c6e57814cb744ef2bb38572b