Merge "Rename storage and usb to just storage" into nyc-dev