Merge "Public volumes belong to a single user." into nyc-mr1-dev
am: 0f35d29a7e

Change-Id: I6948a2b174ab8a328fdedf80f0adc564aec93e60