Merge "storaged: remove access to sysfs_type"