Merge "storaged: lower capabilities in init" am: 183b575e78
am: 04cc5c3616

Change-Id: I2b1f68bfc21febb0f5ade62d06815377b03c77eb