Merge "Keep the existing behavior of Currency.getInstance(Locale)"