Merge "Fix nit in LocaleDataTest#testInvalidLocale and StringTest#testFormat_invalidLocale"