Merge "Revert "Prevent monkey from changing usb settings""