Merge "Better public volumes handling on secondary users." into pi-dev
am: 4abf0f708f

Change-Id: Ibf736f62f884b2effc663b059ab4c692d71fffff