Merge "Clean up USB*Manager."