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

Change-Id: I5c57bb60ad565b4382184dbe55fc0e61d2fc3f0f