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

Change-Id: I12457a332701efd588cbff628fe50af32ab9880d