Merge "storaged: owner adjustment"
am: 387319307a

Change-Id: I0faa3fd6cc6bbe0b33db5873f9a44f83909aaf74