Merge "storaged: owner adjustment" am: 387319307a
am: 785c18d4d1

Change-Id: I8fc93957370c2ef95ddbea5ce1d3f16ada31611d