am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev

* commit '385ce0a31dbdd4b4b1865755dbc4af157f72481c':
  Replace Locale.getDefault with custom impl.