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