Merge "Fix a test that assumes Locale.getDefault() == Locale.US"