Merge "storaged: remove unused includes"