[automerger skipped] Merge "storaged: lower capabilities in init" into pi-dev
am: 7b7901a849  -s ours

Change-Id: I3353580d65bb2d036200b72c7a9239bb18049840