Merge "Make sure we have a ";" after locale in User Agent"