Merge "Fix a couple of Locale bugs discovered by ICU4J tests."