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

Change-Id: Id2fc327134b9b0f6d6be242d124ccd52b227974a