Merge "Revert "Enforce USB and storage restrictions""