Merge "Replace Locale.getDefault with custom impl." into mnc-dev