Update storage for 4.2, add back OTG Storage