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

Change-Id: I0188c9744af905133ad36ab45705828d5286b804