Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab
am: 7738ebcd5c

Change-Id: Ib812b973ddb26098f10bd88a7ec19573bdf900c0