Merge "storaged: remove protos from storaged class"