Merge "Re-implement ICU.getCurrencyCode without accessing the ICU resource directly"