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

* commit '63790291a4c385d3e92680af816f4fe32d6535ef':
  Replace Locale.getDefault with custom impl.