Merge "Adding USB exception for mschilder."