Merge "Don't send device info in OPTIONS command"