Merge "Storage: clean up init.rc for storage" into main