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

* commit '618d96da7893fad4012353233c1c45db4e9d62ba':
  Replace Locale.getDefault with custom impl.