Merge "Fix LocaleTest#testDefaultLocale."