Bug 961718. enableUSBStorage1 is shared in two different places