Merge "config: remove USB devices in policy config file"